Fixed update system so it's less horrible.