New style and some fixes