A bunch of bug fixes. Added new namespaces as well
Added local stuff