Restored NAMESPACE
minor tweaks to settings