many usuability improvements
Merge pull request #5629 from ricardoquesada/setup_fixes

many usuability improvements