Fixed some namespacing & documentation.