Fixes on install and new features