bug fixes for missing callbacks - compiled this time