Added Idris support and fixed some bits and bobs.