Revisions to Version 1

Fixes #7 
Fixes #4 
Fixes #5