Gists, renaming, improvements