7.569
+ minor fixes