Added commenting and number plugins