Fixed flawed namespaces and improved the console display