reorganization; added section editing