fix 2.2, and small width bugs