fix some garbage / never used values, add infinity

clang --analyze brings up these warnings
Sorry, I'm not sure what "like this" means...