Improvements

Michael Robinson