ticked 24apr done and fixed a bug in oscfunc