update namespace and some final touches