fix belongs_to; clean up;