Comments edit fix+extra stuff