style and fixes