Added some options, documented them