OMG so many bugfix (2.1.12.310)