A couple of changes proposed by Jesse