fixes based on pull comments