minor changes, TODO list added