more around estimation, cleaning up a bit of the mess