made some more adjustments