tweak to SPEC definition, minor improvements to x86-86 model