#44 First portion of API 2.0 spec fixes

Spec fixes are in progress