cosmetics and minor changes (some improvements)