change namespace and other minor fixes