Wide variety of tweaks, primarily for consistency