fixed other issues