added and rationalized some options