more updates to logic, copy and tests