Fixed comments and login