Add --cask option. Minor tweaks.