Various Bugfixes.

New features maybe be introduced in this branch.

Note that you are following the development branch! Faster access to features and higher chance of bugs.