Various tweaks and small changes.