fixes of YAMM.cs