* work

* fixes

* updates

* update table layout

* revert changes

* notes

* updae names and improve flow