SQUASHME: Addresss still more comments