tweaks
merging with becky's translations
Merge branch 'master' of github.com:/cenotaph/villistadi