small adjustments to the last commit