improvements and fixes in the organization section