Testing and commenting improvements.