wip
performance digression.
fix table alignment
some tweaks