Updated egypt, junction, frieght, and other minor fixes