fixing router and parameters
adding default and fixing bugs