Minor changes

updates namespaces, fixed trajectory bug