fix some garbage / never used values, add infinity

clang --analyze brings up these warnings
Yes, I'd do this.