comments added and key-bindings updates
misc functions cleaned up
TODO list updated