style and data fixes