Fixed starting of current to allow for a start of -1 meaning the start state. Also,
fixed quotes in two templates.