added set id to user
db schema tweak

nothing big, just rearranged some stuff