Fixed some of the versioning.
Fixed miss named properties.
Removed some unneeded checks and added exception throwing code.
Small cleanups
Merge remote-tracking branch 'origin/master'