Adding metis, minor updates to code