Improved install and fixed small bugs