Added Debug TODO
minor cleanups (comments) - and using using = instead of typedef to simplify/clarifify some declarations