Added routing specs
Improved speed of specs
Tweaks