fixing up a few minor issues