cleaned topics etc
merged conflicts