nice styling and fixes