Bugfix. No remaining known bugs.
Added and organized TODOs.