code refinements,use gettext everywhere, some marginal cleanups in contents