Rework's and Edit's

Rework's and Edit's

ACOR