Some suggested corrections and modifications for increased efficiency

Hi Richie,

nice little package!

It's the first time that I actually contribute via git/GitHub, so please bare with me in case I did anything "wrong" ;-) 

Best regards,
Janko