Cleanup, tweaks, and whatnot.