fixed some namespaces and comments