finish initial changes part 2

minor changes