Added todo list and fixed up a few issues.