[FEATURE] added some more API call features
[CLEANUP] did some cleanup on error messages