6.0.2 Update

Working on getting this ready for 6.0.2 WoD