organization fixes to medium problems