Bugfixes 5

+ A few misc changes.