some of the immediate fixes