Some modification and cleanup
More translations
More modifications
submitted version