More intelligent way of recognising ops
Better arg handling