Fix spaces in SAM files
New tables for snap2