various imrovements
Merge branch 'master' of https://github.com/leaflet757/cs20