Fixed and added some tables

users table hasnt been modified yet.