Minor updates. Adder aggregation complete (Good enough)