Added some extra descriptions, comments, new arg values, etc