some changes after initial feedback