General tweaking

Perfectionist time.