Bug fixes + TODO list added.