Re-wrote routes & fixed typos