some changes to datamanager; should be good to work on now
Merge pull request #75 from rjynn/master

some changes to datamanager; should be good to work on now