Added options to plugin; added commenting