fix everything Eelco and iElectric found to be improved