changed to callbaks, little fixes