Minor changes after review from Luke.