Fixing router and comments