commented out constituency and map;
small additional changes;