Added all suggestions made by ShaiV