reorganization, fixes