minor issues
whew
tested