small updates and starting to tackle ToDo's