update 8

some fixes