Comments, Swit and User sign up revised