Simple changes before weekend

Some debugging hints are included, and the model is changed.