Clearer names, debug output, anti-magic