Made some minor improvements