Changed lines 101, 147, 260 and 285

See the comments on nickvergessen's quickinstall fork for a detailed
discription of all changes