Generalized short running option, cleaned up options