Round of bug fixes
2.0.9 non-release
Better error handling with API