Use passed options and corrected usage info