Improvements

One correction and some internal improvements.