Clean up core output
Futher improve core output
Merge branch 'master' into chewbacca
Merge spell files
Merge branch 'master' into chewbacca