Various improvements and start of minimization