added org matching
made all generate IDs repeatable
Minor changes