added protein settings, added fat% adjustment