Treasure generator armor cost is wrong

[ironballs]

Hi,
when I put maximu amount of 1000 - it generated several armors +1 with the total cost of 1000 gp.

it's incorrect, as the 1000 cost is strictly for the magical '+1' effect, the total price should also include the armor cost (which is master work).

So, currently a Full Plate +1 shows 1,000 gp.
it should be 2650 (Base 1500 + MWK 150 + Magic 1000).


P.s.
it's probably the same with weapons.

Cheers.

[ironballs]

One more issue I noticed:

Wand for Cantrips only produce light or detect magic wands.
what about all the other 0 level spells?

reproducable by input: select max value: 2000, max per item: 400.

Cheers.