New branch made with old many models, and the master is cleaned for Markus
Comments are corrected, ready for Markus