- Fix calories calculations for entries
- Fix entering amounts other than serving
