Final changes (HOPEFULLY) to compcards module

124 files of wonder