Issue 59

This address #59 by simplifying the setup in addition to correcting a host of issues.