more minor changes prepping for merge