* Smaller bugfixes and changes (to be continued)