LAC-9: Add modes, also many small improves