Another massive update.

Cleaning/Adding new code while waiting to update to 1.6.2