cleanup; bug fix on HP Spectre XP