all to yield format, several bugs fixed