smoe bugs fixed