Second round of changes and text