Updated several issues including router file