fix up some things
nice!