Added model.ucls and some cosmetic changes