some more small adjustments