reflect new functionality in README, fix up newline issues, refactor constants