classes: fixes to two-handed handling