Token error information to config, other minor changes