make it work: more roll backs
bux fixes
Merge branch 'fancy-compota' into review/fancy-compota