Minor bugfixes
Bugfixes, using .json files because they're easier to parse and saves on API calls