refactors json method to return json; adds comments for .dist test values class
removes junky mtrace stmts
adds more lib tests
refactoring generator class hierarchy