Tried to make initial install a bit more sane.