couple misc changes