t/ tweaks
Cleanups, alt params parser
Minor cleanups.
Minor optimizations