style updates and fixes