Some more little improments.

Most vague commit message, EVER!