Thanks for the tips, I will apply in the next updates. 
And I'll try to stop by and let you know that I've updated the OP.