added generic.swg, xlib issues