Fixed few npc formulas. Reverted old fishing spots