bug fix
ongoing work on hold and table mngmt