battery light is due to a loose/faulty earth. Chech all the main earthing point, id thr engine earthed corectly? I had the same problem with mine due to an earthing wite split, it is easily done when swopping engines.