Edit topic / message and small fixes