Rules module is done; minor fixes