This should fix the errors on startup.

Not sure about the list.Set's being here. But this whole system is kind of fucked anyway. I'll try to clean it up.