Bug fixing and better transaction management thanks to cgeek