Finish fuzz/defuzz method definitions, misc bugfixes