updated sgs, removed merged addons and updated code to fit them