Updated routes to include all main required routes; fixed few bugs accordingly