apply brutal patch from lucas + little updates