Add gon watch
Add some routing fixes