minor re-org, adding missing bins