More cleanup
More ref fixing
Merge pull request #61 from glennblock/dev

More cleanup