Cleanup, fixed conflicting namespace, more logging