Chloe changes

stable changes by Chloe 11/11
Chloe V latest updates