Minor fixes & buggy rules commented for analysis