Now handles values that have a max, but a 0 min
improve calorie defaults
Merge branch 'refs/heads/bugFixes'