Cleaning up Mantra, and adding dependences