style and few additions