fix table sizing bug, readded highlighting, further improvements