Move to latest tools
Get key substition going again
Make sure the journey overlay is initialised - fixes #3