A series of improvements

Here is a series of small improvements for your consideration