fixed toString compatability and fixed more merging conflicts