minor corrections and re-organizing TODOs