-refactor some shit
- fix api key errors after phoebe release