Added todo list and some minor changes