fix some styling stuff and other minor issues