Added more options documentation and some notes