Adds more configurable options
Fixes edge cases with comment options