Updated for version 2.6.1

Now with some bug fixes and utilizes ore dictionary.