Improvements

More to come...
Thanks for pointing that out :wink: