Fixes Icon, File Cleanup, Code Fixes