Fix and improve installation