Fixed some updating bugs/weirdness