Fixed tableSet not being re-set at the right time.
Fixed rSet not checking for null valut before closing.
Merge branch 'gui'