[DO NOT MERGE] Supermatter Tweaks

I still have more things I would like to tweak, I thought I'd put this here so people could give feedback if they wanted.