Changes in the model + better debug prints etc nitpick (TMP)