Fix and improvements.