prettied up some more stuff