Fix comments and fatpacked versions