Making the parsing resiliant and handling spacing oddities