Improvements

Do not install yet.