Many Wyraz fixes and improvements