Few general changes, to be shown to wp.org