Various bugfixes, also ported up the ore dictionary new blacklisting stuffs