Added Fancy support

And a few minor fixes.