Fix some typing errors, fix spdx copyright information,
fix a mismatch between old and new models with the new
snap_match command