some clean up
some changes incorporated in submodules