Better token validation and reporting. Also -n option to pusher.