Coverage improved, annotations fixed