various small adjustments