Minor fixes + save all files as .zip