4th commit: small corrections