Add defuzzification block parsing, fix misc bugs