Completed

Fix-Up work and Additional Extras for ACG