Topic

correction problems and fixes