Improvements - a bug remaining