Fixed most of the exp as variable vs. function problems