fixed the large change bugs, still needs testing