Cleanup
Fix broken things.
Actually take into account the modId data.
Agggggh.