minor fixes, gogo