last bug-fixes before major update
merged newest changes to development branch