fixed additional bugs