make some changes

and

some

more