Cleaned up startup and fixed namespaces.