Reworked some estimation routines