Bug fixing, in progres