Small fixes.

Fixes of minor inconsistencies, spelling and formula bugs.