lights like candles

quick question.
last time i was out riding. I stopped to get new front bulb for indicator. Whon the way home the indicators were not working and the headlight power was pathetic. even when the bike was on or off. I dont whethger its a case of the battery not charging or somethign else.
even the speedo backlight didnt have neough power when the headlights were on :?:
what u guys think?
does the stator charge the battery? only thing i can think of is the contacts being dirty or rusted on stator again. thats even if they have anything to do with charging battery.
possibly its wired up wrong?
I have just recently rebuilt it but they were ok since

ok well I havent checked voltages yet or ran the bike but i just lifted the stator out. it has two rust spots. I know these are a known prob. I clean it allot and it still rusts. this is a new stator at xmas as the old one which the last owner never cleaned had allot of rust on the contacts(resulting in no spark when i bought the bike).
I have both here side by side and would like to know is there a good effective way of stopping these corroding?????
i assume this is the cause of my weak power/battery charge problem.
these items are bloody expensive for something that are soo prone to failing. I have attached a pic of both stators.
what is the best way to clean them? should the casing be sealed in some way? i already use wd40 as a coating inside flywheel.
the stator has 4 smaller contacts on the outer side. are these for charging? as thats where to two current rust spots are
if i can clean the contacts to get it working again then can i do the same with the old one that has 50% corrosion. what is best way to clean them? i have been using wire wool by hand. would a wire wheel and drill be too harsh? do the contatcs need to remain smooth?
any help appreciated.. im gettign a bit peeved with these items

oh yeah.. heres the pic