several changes due to finalized user management

I hope it is all working but from what I saw it is.
I changed a few things regarding column names so there are some sql
table updates included as well.
I also housekept some obsolete includes from mine