Removes namespace from misc functions, misc tweaks