Some fine tuning and added some more to todo list