Some pending changes, cosmetics/formatting