Few more specs and some minor cleanup
Added a to-do list