Routes and errors fixed - ready for editing