.gitattributes and minor data structures edit