bit of an update
more adjustments