added todo items according reviewer comments. just search for "TODO" or use one of the many TODO plugins for your editor of choice