Cosmetic improvements, bug fixes to the update script