Miscellaneous Tweaks

See commits and/or bug me in IRC