namespaces, fixed warnings