For the headlight, I would suggest something like this:
http://www.dealextreme.com/details.dx/sku.13096
and this to mount:
http://www.dealextreme.com/details.dx/sku.792
For about $20, it will be much brighter than anything mentioned so far(you will want rechargable batteries). Even better, spend $40 and get 2 sets. If you are so inclined, you can make your own light for the fun of it, too. These solutions fill the Grand Canyon gap between the useless but affordable Cat Eye/Blackburns, and the ridiculously expensive but useful options. The more blinkies the better for the tail light.