Bugfixes
Cosmetic corrections