fixed saving and re-use of form fields
improved plugin-config