fix a few things up