New styles and some other improvements