some fixes
Revert "some fixes"

This reverts commit 4637c4e6837b8029b01cc9855450ff47df0b76e3.
try again
Merge pull request #2 from dhigginbotham/jon-branch-new

remerging jonathans branch to master