more misc changes