more cleanup, fixing install