Updated specs and included a few additional rules