Fixed up routing somemore
Various