Fixed some namespaces
Minor changes

Added some explanations and fixed a little mistake.