more fixes, cheers @TheSumm