fix things based on feedback