Enabled new mmr data and changed lists to sets

Also whitespace and shit