1. Yes, I'll definitely add calories, good suggestion.
2. Yes, that's probably a good idea. I should distinguish constants and (user-defined) variables.