Changed callback function name, ported progress-simple and other minor, but sweeping changes