Indeed. Will change. I'll try to find some time in the weekend to implement all requested changes.