Final Beta 6 fixes and changes.