Corrections/bug fixes for 201314 update

work still in progress
Versioning