minor fixes & addition of more TODO notes