Fixed Namespaces and added some comments.