lbarsanti - 2012-03-01

I'm traveling for the next three months. I'll look at this and the other bugs when I get back.