code cleanup and persist settings on a global level
update plugin archive