Updated some settings for Windows
Added Modules