more style and compatibility changes