Bugfixes

Corrected a number of bugs introduced in the Version 1.0.0 release.