made a bunch of stuff prettier