more fixes to topic