Updates/derp fixes