fixed some changes messed up in merge