some small adjustments and tests