Updated ubuntu default install file, and cleaned up