Crazy track work/end of line rail bug fixes