wip bugfixes


Author Orual Date Commit Parent d3c5919b Change ID