fix settings route & come clean up :)