Small improvements

Hi,

thanks for your program. It works pretty well for me. Here are two patches that made my live easier :)

Cheers,
-Michal