Fixes

+ Some bugfixes