Edit stuff, even more than last time.