more cleanup
added all the namespaces
remove debug calls
commit base classes