More changes/fixes to Plugin and DefaultFormatter