some improvements, cleanups...
Merge branch 'master' of ssh://github.com/ser2-creator/ser2-collect
some improvements and cleanups