improve installation process, update #2176