more bug fixes, woops
Merge pull request #5 from trdenton/master

code reorg