ToDo's added, minor cleanup