fixing up a few things