Scan fixes

* never touch the model
* save priorities
* puppet - fix
* other fixes