fixed up a few things