some small adjustments