More constants, address some miscellaneous todos (or at least add to-be-tuned constants for them.)