add missing info to PHPDoc
add unmap method
fix namespaces