Mex's changes to the ircParser