couple of more adjustments
Not sure what these changes are.