final fixes to right topic