Some fixes needed for me, maybe usefull for others

I made just a few changes over you fork, which looked like the most updated.
Let me know if you find these useful