fix and test header option
change token syntax
fix token test
fill in docs