bug fix, improved routing  and added user managment