Added some stuff for parsing single-line headline. Mostly broken now