Improve installation
Improve behavior when not installed