some more org changes