ToDo's added. Formatting improved.