ed 2nd fid and other fixes i cant remember