#18 code updates

- simplified / enhancements
- put back table check