scenery generation
merge with master
some tings
merge with master