#29 Drawer counters and small fixes