I did some cable adjustments and after a test ride the click box seems to be working now, rear mech is still a bit sticky. Using the original I4 42 tooth chain ring, the bike is still under-geared going down hill or on the flat with a good tailwind. There is however plenty of gears for getting hill.

I think I can live with the gear rations as they currently are but a larger chain ring will be an improvement.