[@Naril] I have done some polishing around, hopefully it's in the limits of acceptance ^^