fix bugs, comment user now works