Add commands and fix parser
HTML entities were being unescaped twice