name & email in git, minor fix, reorder