More fixes

All of this I've tested pretty extensively. Shouldn't break any saves (I was going to change some sustain costs but saw that it would create some funny values so figure I'll hold off on those).

If I'm not on IRC feel free to email me with any questions. I'll probably take a break from the computer for awhile today.