Applying various changes
Merge branch 'api-resources' of github.com:edwin-bluekite/tHAPIcs into api-resources