cleaned up a few minor issues