made calories a calculation based on macronutrients
added timecop