Small fixes
More work on the Hush parser