fixed namespaces
fixed undefined classes in doc blocks
fixed some doc blocks