Update main, allow some more derpyness.