Minor bug fixes.
added TO DO note