Updates to commentary and main plugin