Added and documented several options