Fixed some inconsistincies
For some reason DSPgui.m had merging issues