Minor fixes/tuning
Merge branch 'master' of https://github.com/PhoenixBlack/Metrostroi