Fixed type specifiers;
added to-hiccup formatter for diffs;