updates based on suggestions from Tryptofish
updates based on suggestions from Tryptofish