cleanup and table adjustments