fixes based on github comments