Token authentication + some data tweaks