Implement picking & dashed lines; adapt tests