fixes

3.2, 6.1, 6.2, 8.2