delete + little fixes