peter's fixes