W2D1 and minor edits