Additions/updates to parser.php