Lots of updates for a cleaner install and no configuration