Fixed up some logging and then prettied it up