bug fixes in comment managment