formatting tweaks, fix .zip links
merge