Fix routes and API
Fix routes and API
massive commit