More small tweaks, tested on a Win7 64bit netbook