simple-handler finish: TODO a few things