fixed some namespaces & doc blocks