style and other fix