fix a few screwups