Fixes for bugs

I've fixed some issues in the code regarding the API-calls.
The work on better code readability and streamlining has also continued.

Make sure to update to this version.