Straightened out the WebApi bits some more, added better parsing