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

This reverts commit 0dabeb2e508c81d7bc017cb9d7b628fafd020b91.
Revert "Revert "various imrovements""

This reverts commit 5f2a8e207a06cee89b653713db4c955f633fbd37.
Merge branch 'master' into weaponsbranch