Minor updates
integrated zlib with some cleaning