Clean-up constants (first sweep)
Formatting fixes for output module.
Bump package, add more keywords.