Add namespace, other small mods