Add defuzz methods, misc bugs