Added x axis labels, fixed parser bug