cleaned up uniferlib (a bit)