Clean up
Add view core helper script
Merge branch 'master' into chewbacca