removed erroneous comments
security fix to prevent malicious overridding
setting up plugin defaults
merging