add ability to change token from cmd line
remove some testing lines
add in some debug