some fixes to org