fix up a few things