update namespace, minor tweaks