added some use stricts
supports click to route
Merge branch 'dan'