Added/documented more conditional