Updating namespaces and more matrix and math stuff