some comments, minor changes, TODO list