a few tweaks, plus parsing of data for callbacks and service agreements