trying to fix some minor issues