Improved terms and some other styles.