style updates, validation and fixes