style and 2.1 updates