Minor tweaks to the errors, cleaned up and fixes to the included demo, updated json package. Bumping version to 2.1.1