improving format on gitpull etc
plugin files
doing some merging