fixed up ubuntu-upgrade and added more files