cleaned up namespaces and other misc things