pickline on/off support + bug fixes