minor changes to logic and copy