I have made some alterations, let me know if you are satisfied [@pyroman]