Lots of fitness tweaks