Fixed some inconsistencies with the API