Cleanup, added TODOs, implemented adding assistants