Tweaked form and tables a bit on Estimator