fixes for gitmodules and setup script