fixed another bugs