finalizing design and other changes