Local abbreviations
Some improvements
V1.6.2