Wire us scenic route, fixes and refactors