secret token again
fixed minor bugs