fixed magik6k's derp
more fixes
prepare to remove widgets