non-zip files fix for moderators and clean up a bit