first round of small changes