Fixing Issue #1 with windows not able to download files. Some cleanup.