Cleanup, comments, TODOs, docs, features