fixed router api call and lots of shit