huge code refactoring
some dewarning
Merge branch 'streamer45'
Merge branch 'master' into oneman