Merge conflict
Add more pretty vmtrace logging
Improve pretty trace