fix language bugs