GIF and other small changes