Tweaks during the everytihing revision.