Get rid of swap, add battery monitoring