First model and general fixes