Further testing
+ Minor bugfixes