include commits from original, correct translation
more changes from original