Infrastructure improvements

ongoing cleanup