addressed a few comments - will get squashed