further fixes from AJShort + SimonW

THANK YOU