Fix up some org stuff
Fix up stuff