Minor corrections

Multiple minor corrections according to Lisa's and Sasha's comments.