fixing up a couple of things