small changes throughout, but otherwise looks good to me