Clean aggregator, fix syntax hilighters, and small things