Moved all hooking to category, added class method hooking, fixed bug where correct block signature would be detected as incorrect