Added user comments and fixed comment pushing as system