Fix Comment + Fix Folder