Fixed most of the issues that Dan commented on in his review.
Merge pull request #87 from csu-hmc/dan

Fixed most of the issues that Dan commented on in his review.