More API additions and fixes.

Should be a higher score on code climate as well...