numerous fixes for puppet