Various tweaks and beautifications.