fixes to uses soap