SQUASHME: addressing comments
SQUASHME: added missing files