misc changes 2