updates for source install
more work for source recipe
incorporate HeavyWater changes