fixed some changes that got lost