Some tidying up
fix mayavi and parse the yaml