misc spacing and warning corrections