improvements

Thanks for your contribution, it was enlightening!