Dianne,

I think that the calories look ok, actually you come a small bit under the guidelines so you have nothing to worry about there.

The general rule is 60 to 70 percent fat.
And 10-12 times your current body weight.

Protien would be then 25 I guess or around there leaving 5% more of less for fat.