A few improvements to capstan cmd