Fixes bugs related to table refresh

Handles issues #12 and #10