Tidy autopatch and update print statements

[sandreae]

• update print statements
• re-order code
• update "last called" test

Of course, I'm sure there are other ways of doing this....., just having a go here.