General styling, squashed a couple of bugs