made some changes heh