Added code for some minor fixes and also did todo list.