Fixed delete bug and started comment integration