fixing up threads and comments implementation