more fixing stuff and putting pretty things