Install script update, minor fixes