more cleanup of styles and issues