fixes based Danny comments