Updated some stuff to support a wider variety of computers (UTM!)