Admin routing bug fix, adding comments, code clean up.
Merge branch 'dev'