various fixes based on community feedback