fix #358
fix #362
Merge pull request #364 from olga-jane/Issue358

Railcar NewEdit Fixes