1st try of a pull request

I changed some minor things to solve some problems we had while running odml for our experiment.