Added help messages
Added some TODOs