Added namespaces and cleaned the docs up a bit