Several plotting improvements, mainly from Dean with input from Jeff -
set template in the right place, comments about what to do next, etc.