good progress, added rule enforcement among other things