address the rest of @sjcorbett's comments