Cleaning up a bit
Added some more 1.7 loot
Final 1.15 commit