fix org stuff