some hand modifications
7 lines, not 5
fixes
manual fixs