minor fixes, thanks to @TheSumm