Last minute tweaks and herp derp fixes