more misc changes/cleanup