fix & improve plunkSource