Many Misc Changes
1.6.4 Port