Install script and minor bugfix