FIXMEs, TODOs and some comments added.