Amends after development stage, cleaning up minor elements and details