Updated user's current table and fixed some bugs