batched fixes based on Ben's feedback