fix some minor bits