[njhaveri]

#1 - oops, I filed a bug to fix this up. Thanks for pointing it out.

#2 is something I'm hearing more about... I'll plan on offering this in the future.