Refactored text additions for easier #16.
Fixed #16. `--same-line` is now an option.