Overhaul of names/namespaces/etc... and some bugs fixed.