Minor bugfixes
To do list updated