added some bug fixes and some styling i missed