Updating variables, lots of cleanup/change of kickstart config