Finish rules implementation; minor change to spec