improvements. too tired for useful comment