Bug fix + TODO list added.