Update deflate.c to include nearly all the changes I've been making