aggregate space and fixes