Added Comments and comment editing