merged AC and CMD, added bonus breakdown

also removed old Amroth