fixed namespaces
Some updates