with english version + minor fixes