Some comments and minor changes
removed a todo comment