slight performance mods and cleanups, trying to get faster than Q always... but since they're not spec compliant its apples and oranges