Updated documentation + cleaned option list