Build 7 fixed, testing if XP is stable
cleanup