Ned/general improvements

A number of things that I changed while working on more substantive changes.