I think you'll find the indicators staying on issue is how they are in Japan, mine were the same. One of the three connections to each indicator needs disconnecting.
The headlight? Can't help you there I'm afraid.