bugfixes for revi
Merge branch 'dev'