Cleanup
Force callbacks into an array
CHANGELOG update