updated todo with current direction
cleanup and expanded testing, several bugfixes from refactoring, more todo