Moar changes and stuff

Changes to heading, tweaks, and more.