Smoothed out a bunch of comborific stuff