1.6.4 Master Merge and some Work

Here's the work I mentioned. I also merged everything from the current 1.6.4 branch.