Some more work on the Hush lexer and fixed some bugs