City to upgrade freight movement, bike/walk safety on Marginal Way