Decent amount of fixes for HandShake/TokenStore system. Better scalable now...