allow 32 bit, tighten things up, remove some vars