fix callback + bugs fixes