Added comments, TODOs, FIXMEs