Fixed who to blamen
Stopped memory leak by adding missing callback
fixed merge problems