Fixed stuff and made things pretty