bug fixes and updates
Merge branch 'devAPI' into API
Fixed merge conflicts when merging API into develop.