move instruction in condition
remove tooltips
Merge pull request #496 from arnaudbey/miinor-fixes

Miinor fixes