Fix bugs and add total user