included bunch of namespaces and added comments