lots of org updates