Add various command-line options