help fixes by ToM