fixed issue with missing callback param and other minor issues