removed token
restructure mongo queries
rename to auth_token
merge still a few misses but a lot better