Clean up trailing spaces
Add missing docs for some options