removed some bugs in linux