updates from Lizzzp and VA5