Merge branch 'master', remote branch 'origin'
clean up of vi edited code
lot of small changes done on BM29 ...
highly untested hence buggy :/