Lots o changes, it should work

added all item/npcs