minor changes, added TODO list