* Small Bugfixes
* Added a todo for an important change