minor bits here and there