Updated todo list, minor code changes