bug fix & added new plugin