Compugeek,

You may want to consider switcing out the Minimag flashlight. they have a horable tendancy to not work when you need them. You may benifit by upgrading to a higher quality LED or Xion Bulb.

I would add a flat roll of duck and black tape to you EDC, No matter where you are Duck and black tape are usefull. Personaly I end up using the Duck and black tape in the urban enviorment more than anywhere.