add commentary plugin; cleanup