HEAVY bug- and logicfixing