Updates, cleanups, english version