final deploy refinaments
Merge branch 'devel'