#636 cleanup and minor Table changes.