Tweaked tip calculator, and some other minor changes