Second round of changes, easy ones based on Evadne's feedback