More comments, and comment cleanup
Enable wrap_structs by default
Standardize names