fixed bug and better osc variables handling