Basic changes to a few functions to improve API usability (friendly
returns, etc).