good changes
good changes
plugin format
more modularizing