reorganized
minor tweaks
gzip